Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 06:26:01 +0000 (22:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 06:26:01 +0000 (22:26 -0800)
commit07e28f80feb91ccf65dc3d6e37f08104f9a2ca79
treeae97a98dac89465aecfe8038f9d8d8b171c2e3a3
parent87258fd96736551dc0f1af637ea08d13b2bea7f4
parent93e2189fdbb94aea4bdac26258b29baf1c28d5a4
Merge from trunk.